Fixed compile failing because Resolve::features() no longer returns an Option.
authorJames Bendig <jbendig@starbytesoftware.com>
Mon, 27 Feb 2017 21:45:39 +0000 (15:45 -0600)
committerJames Bendig <jbendig@starbytesoftware.com>
Mon, 27 Feb 2017 21:45:39 +0000 (15:45 -0600)
src/cargo/ops/cargo_rustc/context.rs

index 4c97cad339afeea49933dff052c0c1a22673a63e..756022dbc747a03d78d95c3b0d0e85eb83ef7be6 100644 (file)
@@ -639,16 +639,13 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         // Integration tests/benchmarks require binaries to be built
         if unit.profile.test &&
            (unit.target.is_test() || unit.target.is_bench()) {
-            let no_features = HashSet::new();
-            let features = self.resolve.features(id).unwrap_or(&no_features);
-
             ret.extend(unit.pkg.targets().iter().filter(|t| {
                 let no_required_features = Vec::new();
 
                 t.is_bin() &&
                 // Skip binaries with required features that have not been selected.
                 t.required_features().unwrap_or(&no_required_features).iter().all(|f| {
-                    features.contains(f)
+                    self.resolve.features(id).contains(f)
                 })
             }).map(|t| {
                 Unit {